RDKB-62878:Enhance Sample App Automation and Remote Log Access #801
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Aniket0606
force-pushed
the
csi_sample_app_support
branch
from
aa52390 to
85de41b
Compare
Contributor
Contributor
|
b'## WARNING: A Blackduck scan failure has been waived A prior failure has been upvoted
|
Comment on lines
219
to
223
| if (execute_system_command_with_status( | ||
| "/usr/bin/rdkssacli \"{STOR=GET,SRC=kquhqtoczcbx,DST=/dev/stdout}\"", | ||
| output_key, | ||
| output_len, | ||
| NULL) != 0) |
Contributor
There was a problem hiding this comment.
What's the point of filling this buffer at this place if it might fail or will be overwritten later with another command output at lines https://github.com/rdkcentral/OneWifi/pull/801/files#diff-1d7faf20d911b0287acf3399680c51aa629b17b99f49a25cbb6ca2c9286ccc0eR235-R239
Contributor
Author
There was a problem hiding this comment.
I didn't get you.
Contributor
There was a problem hiding this comment.
You supply output_key and output_len here to fill that buffer and later you fill it again overwriting whatever it was filled in here.
| size_t len = 0; | ||
|
|
||
| if (!cmd || !cmd_output || output_size == 0) { | ||
| errno = EINVAL; |
Contributor
There was a problem hiding this comment.
You set errno in here and print error here: https://github.com/rdkcentral/OneWifi/pull/801/files#diff-1d7faf20d911b0287acf3399680c51aa629b17b99f49a25cbb6ca2c9286ccc0eR181
Please choose single approach.
| int get_server_password(char *output_key, size_t output_len) | ||
| { | ||
| if (!output_key || output_len == 0) { | ||
| errno = EINVAL; |
Contributor
There was a problem hiding this comment.
You set errno in here and print error in other cases.
Please choose single approach.
| if (len + buf_len < output_size - 1) { | ||
| memcpy(cmd_output + len, buffer, buf_len); | ||
| len += buf_len; | ||
| cmd_output[len] = '\0'; |
Contributor
There was a problem hiding this comment.
I think this can be moved outside the while loop.
| char curl_output[1024]; | ||
| int curl_exit_code; | ||
|
|
||
| #if defined (_XB7_PRODUCT_REQ_) |
Contributor
There was a problem hiding this comment.
Suggested change
| #if defined (_XB7_PRODUCT_REQ_) | |
| #ifdef _XB7_PRODUCT_REQ_ |
|
|
||
| int upload_file_to_cloud(const char *file_name) | ||
| { | ||
| static char password[256] = { 0 }; |
Contributor
Author
There was a problem hiding this comment.
I am getting password onetime and then using the same password later.
Comment on lines
+269
to
+310
| if (strlen(password) == 0) { | ||
| if (get_server_password(password, sizeof(password)) != 0) { | ||
| fprintf(stderr, "Failed to get server password\n"); | ||
| return -1; | ||
| } | ||
| } | ||
|
|
||
| for (int attempt = 0; attempt < 2; attempt++) { | ||
| snprintf(curl_cmd, sizeof(curl_cmd), | ||
| "curl -s " | ||
| "--cert-type P12 " | ||
| "--cert %s:%s " | ||
| "-F \"data=@%s\" " | ||
| "https://devprimary.vbautobot.comcast.com:6002/post_csi_file", | ||
| cert_file_name, | ||
| password, | ||
| file_name); | ||
|
|
||
| if (execute_system_command_with_status( | ||
| curl_cmd, | ||
| curl_output, | ||
| sizeof(curl_output), | ||
| &curl_exit_code) != 0) | ||
| { | ||
| fprintf(stderr, "Failed to execute curl\n"); | ||
| return -1; | ||
| } | ||
|
|
||
| printf("Curl Output:\n%s\n", curl_output); | ||
|
|
||
| if (curl_exit_code == 0) { | ||
| printf("Upload successful\n"); | ||
| return 0; | ||
| } | ||
|
|
||
| if (curl_exit_code == 58 && attempt == 0) { | ||
| printf("PKCS12 password invalid, regenerating and retrying once...\n"); | ||
|
|
||
| memset(password, 0, sizeof(password)); | ||
| if (get_server_password(password, sizeof(password)) != 0) { | ||
| fprintf(stderr, "Failed to regenerate password\n"); | ||
| return -1; | ||
| } | ||
| continue; | ||
| } | ||
|
|
||
| fprintf(stderr, "Upload failed (curl exit code %d)\n", curl_exit_code); | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| if (strlen(password) == 0) { | |
| if (get_server_password(password, sizeof(password)) != 0) { | |
| fprintf(stderr, "Failed to get server password\n"); | |
| return -1; | |
| } | |
| } | |
| for (int attempt = 0; attempt < 2; attempt++) { | |
| snprintf(curl_cmd, sizeof(curl_cmd), | |
| "curl -s " | |
| "--cert-type P12 " | |
| "--cert %s:%s " | |
| "-F \"data=@%s\" " | |
| "https://devprimary.vbautobot.comcast.com:6002/post_csi_file", | |
| cert_file_name, | |
| password, | |
| file_name); | |
| if (execute_system_command_with_status( | |
| curl_cmd, | |
| curl_output, | |
| sizeof(curl_output), | |
| &curl_exit_code) != 0) | |
| { | |
| fprintf(stderr, "Failed to execute curl\n"); | |
| return -1; | |
| } | |
| printf("Curl Output:\n%s\n", curl_output); | |
| if (curl_exit_code == 0) { | |
| printf("Upload successful\n"); | |
| return 0; | |
| } | |
| if (curl_exit_code == 58 && attempt == 0) { | |
| printf("PKCS12 password invalid, regenerating and retrying once...\n"); | |
| memset(password, 0, sizeof(password)); | |
| if (get_server_password(password, sizeof(password)) != 0) { | |
| fprintf(stderr, "Failed to regenerate password\n"); | |
| return -1; | |
| } | |
| continue; | |
| } | |
| fprintf(stderr, "Upload failed (curl exit code %d)\n", curl_exit_code); | |
| } | |
| for (int attempt = 0; attempt < 2; attempt++) { | |
| if (get_server_password(password, sizeof(password)) != 0) { | |
| fprintf(stderr, "Failed to get server password\n"); | |
| return -1; | |
| } | |
| snprintf(curl_cmd, sizeof(curl_cmd), | |
| "curl -s " | |
| "--cert-type P12 " | |
| "--cert %s:%s " | |
| "-F \"data=@%s\" " | |
| "https://devprimary.vbautobot.comcast.com:6002/post_csi_file", | |
| cert_file_name, | |
| password, | |
| file_name); | |
| if (execute_system_command_with_status( | |
| curl_cmd, | |
| curl_output, | |
| sizeof(curl_output), | |
| &curl_exit_code) != 0) | |
| { | |
| fprintf(stderr, "Failed to execute curl\n"); | |
| return -1; | |
| } | |
| printf("Curl Output:\n%s\n", curl_output); | |
| if (curl_exit_code == 0) { | |
| printf("Upload successful\n"); | |
| return 0; | |
| } | |
| if ((curl_exit_code != 58) || (attempt != 0)) { | |
| fprintf(stderr, "Upload failed (curl exit code %d)\n", curl_exit_code); | |
| break; | |
| } | |
| printf("Retrying\n"); | |
| } |
Comment on lines
1142
to
1146
| if ((i + 1) % 3 == 0) { | ||
| if (mac[i] != ':') { | ||
| return false; | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| if ((i + 1) % 3 == 0) { | |
| if (mac[i] != ':') { | |
| return false; | |
| } | |
| } | |
| if (((i + 1) % 3 == 0) && (mac[i] != ':')) { | |
| return false; | |
| } |
| printf(" number of samples to be collected : %d\n", g_num_of_samples); | ||
| break; | ||
| case 'm': | ||
| if (!optarg || (validate_mac_list(optarg) == false)) { |
Contributor
There was a problem hiding this comment.
Suggested change
| if (!optarg || (validate_mac_list(optarg) == false)) { | |
| if (!optarg || !validate_mac_list(optarg)) { |
Reason for change: Added support for providing the client MAC address
as an input to the sample app, enabling automation
of sample app execution. Also implemented a log upload
feature to the server to allow remote access to CSI
JSON files.
Test Procedure: 1) Load OneWifi Image.
2) Execute CSI sample APP.
wifi_events_consumer -e 7 -i 300 -n 20 -m C0:8D:51:A5:FA:74
3) Once log upload done then you will see below log.
Upload successful
Risks: Low
Priority: P1
Signed-off-by: apatel599@cable.comcast.com
Aniket0606
force-pushed
the
csi_sample_app_support
branch
from
85de41b to
5088620
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reason for change: Added support for providing the client MAC address
as an input to the sample app, enabling automation
of sample app execution. Also implemented a log upload
feature to the server to allow remote access to CSI
JSON files.
Test Procedure: 1) Load OneWifi Image.
2) Execute CSI sample APP.
wifi_events_consumer -e 7 -i 300 -n 20 -m C0:8D:51:A5:FA:74
3) Once log upload done then you will see below log.
Upload successful
Risks: Low
Priority: P1
Signed-off-by: apatel599@cable.comcast.com